Add/finish setshort_mustuniq. Fixes holux in testsuite runs.

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 60a4aeb7f22230a78a9ecbbda72aa928b19c6f8b..f836cec31f740c69875d39d4705866ae9f1581b4 100644 (file)
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -189,6 +189,7 @@ void *mkshort_new_handle(void);
 void setshort_length(void *, int n);
 void setshort_badchars(void *, const char *);
 void setshort_mustupper(void *, int n);
+void setshort_mustuniq(void *, int n);
 void setshort_whitespace_ok(void *, int n);
 
 typedef struct ff_vecs {

diff --git a/gpsbabel/holux.c b/gpsbabel/holux.c
index 0218215510af5160e14e83593f146282c5dee95e..1f2bd4c7d5e158e9dbf4c09f4c1dda928e3e59d2 100644 (file)
--- a/gpsbabel/holux.c
+++ b/gpsbabel/holux.c
@@ -161,6 +161,7 @@ char *mknshort (char *stIn,unsigned int sLen)
         return NULL;
 
     setshort_length(mkshort_handle, sLen);
+    setshort_mustuniq(mkshort_handle, 0);
     strcpy(strTmp,mkshort(mkshort_handle, stIn));      
 
     memset(strOut,' ', MAX_STRINGLEN);

diff --git a/gpsbabel/mkshort.c b/gpsbabel/mkshort.c
index 958b52bb2104cc824f2c0c246aa080561c0343fb..9abf9e09cb6a3739e9a8d7f56c0d462997b6485d 100644 (file)
--- a/gpsbabel/mkshort.c
+++ b/gpsbabel/mkshort.c
@@ -88,11 +88,6 @@ mkshort_add_to_list(mkshort_handle *h, char *name)
        return name;
 }
 
-void *
-mkshort_is_unique()
-{
-}
-
 void *
 mkshort_del_handle(void *h)
 {
@@ -186,6 +181,14 @@ setshort_mustupper(void *h, int i)
        hdl->mustupper = i;
 }
 
+void
+setshort_mustuniq(void *h, int i)
+{
+       mkshort_handle *hdl = h;
+       hdl->must_uniq = i;
+}
+
+
 char *
 mkshort(void *h, const char *istring)
 {